diff --git a/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/ElementGrip.scala b/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/ElementGrip.scala
index a2739b4..d7cb7e5 100644
--- a/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/ElementGrip.scala
+++ b/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/ElementGrip.scala
@@ -49,9 +49,9 @@ import org.openide.filesystems.FileObject
  * @author Jan Becicka
  * @author Tor Norbye
  */
-class ElementGrip(name: String, val fileObject: FileObject, icon: Icon) {
+class ElementGrip(val name: String, val fileObject: FileObject, icon: Icon) {
   override def toString = {
-    super.toString
+    s"Element Grip [name=$name, fileObject=${fileObject.getName}]"
   }
 
   def getParent: ElementGrip = {
diff --git a/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/ElementGripTreeElement.scala b/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/ElementGripTreeElement.scala
index 8cd015e..99914b8 100644
--- a/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/ElementGripTreeElement.scala
+++ b/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/ElementGripTreeElement.scala
@@ -69,7 +69,7 @@ class ElementGripTreeElement(element: ElementGrip) extends TreeElement {
   }
 
   override def getText(isLogical: Boolean) = {
-    RetoucheUtils.htmlize(element.toString)
+    RetoucheUtils.htmlize(element.name)
   }
 
   override def getUserObject: Object = {
diff --git a/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/RefactoringTreeElement.scala b/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/RefactoringTreeElement.scala
index 535967f..0ef16ce 100644
--- a/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/RefactoringTreeElement.scala
+++ b/scala.refactoring/src/main/scala/org/netbeans/modules/scala/refactoring/ui/tree/RefactoringTreeElement.scala
@@ -77,7 +77,7 @@ class RefactoringTreeElement(element: RefactoringElement) extends TreeElement {
 
   override def getText(isLogical: Boolean): String = {
     if (isLogical) {
-      RetoucheUtils.htmlize(thisFeature.toString()) + " ... " + element.getDisplayText
+      RetoucheUtils.htmlize(thisFeature.name) + " ... " + element.getDisplayText
     } else {
       element.getDisplayText
     }