diff --git a/kie-wb-common-screens/kie-wb-common-default-editor/kie-wb-common-default-editor-client/src/main/java/org/kie/workbench/common/screens/defaulteditor/client/editor/GuvnorTextEditorScreenPresenter.java b/kie-wb-common-screens/kie-wb-common-default-editor/kie-wb-common-default-editor-client/src/main/java/org/kie/workbench/common/screens/defaulteditor/client/editor/GuvnorTextEditorScreenPresenter.java
index 01aebae5a59..49d856dcb4e 100644
--- a/kie-wb-common-screens/kie-wb-common-default-editor/kie-wb-common-default-editor-client/src/main/java/org/kie/workbench/common/screens/defaulteditor/client/editor/GuvnorTextEditorScreenPresenter.java
+++ b/kie-wb-common-screens/kie-wb-common-default-editor/kie-wb-common-default-editor-client/src/main/java/org/kie/workbench/common/screens/defaulteditor/client/editor/GuvnorTextEditorScreenPresenter.java
@@ -1,6 +1,7 @@
 package org.kie.workbench.common.screens.defaulteditor.client.editor;
 
 import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
 
 import com.google.gwt.user.client.ui.IsWidget;
 import org.uberfire.client.annotations.WorkbenchEditor;
@@ -8,13 +9,16 @@
 import org.uberfire.client.annotations.WorkbenchPartView;
 import org.uberfire.client.editors.texteditor.TextResourceType;
 import org.uberfire.lifecycle.OnOpen;
-import org.uberfire.util.FileNameUtil;
+import org.uberfire.workbench.type.FileNameUtil;
 
 @Dependent
-@WorkbenchEditor(identifier = "GuvnorTextEditor", supportedTypes = {TextResourceType.class}, priority = -1)
+@WorkbenchEditor(identifier = "GuvnorTextEditor", supportedTypes = { TextResourceType.class }, priority = -1)
 public class GuvnorTextEditorScreenPresenter
         extends GuvnorTextEditorPresenter {
 
+    @Inject
+    private TextResourceType type;
+
     @OnOpen
     public void onOpen() {
         super.onOpen();
@@ -22,7 +26,8 @@ public void onOpen() {
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "Text Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "Text Editor [" + FileNameUtil.removeExtension( path,
+                                                               type ) + "]";
     }
 
     @WorkbenchPartView
diff --git a/kie-wb-common-screens/kie-wb-common-java-editor/kie-wb-common-java-editor-client/src/main/java/org/kie/workbench/common/screens/javaeditor/client/editor/JavaEditorPresenter.java b/kie-wb-common-screens/kie-wb-common-java-editor/kie-wb-common-java-editor-client/src/main/java/org/kie/workbench/common/screens/javaeditor/client/editor/JavaEditorPresenter.java
index 04302f87ca4..c6b33962245 100644
--- a/kie-wb-common-screens/kie-wb-common-java-editor/kie-wb-common-java-editor-client/src/main/java/org/kie/workbench/common/screens/javaeditor/client/editor/JavaEditorPresenter.java
+++ b/kie-wb-common-screens/kie-wb-common-java-editor/kie-wb-common-java-editor-client/src/main/java/org/kie/workbench/common/screens/javaeditor/client/editor/JavaEditorPresenter.java
@@ -33,13 +33,12 @@
 import org.uberfire.client.common.MultiPageEditor;
 import org.uberfire.client.common.Page;
 import org.uberfire.client.editors.texteditor.TextEditorPresenter;
-import org.uberfire.lifecycle.OnClose;
 import org.uberfire.lifecycle.OnStartup;
-import org.uberfire.util.FileNameUtil;
+import org.uberfire.workbench.type.FileNameUtil;
 
 import static org.kie.commons.validation.PortablePreconditions.*;
 
-@WorkbenchEditor(identifier = "JavaEditor", supportedTypes = {JavaResourceType.class})
+@WorkbenchEditor(identifier = "JavaEditor", supportedTypes = { JavaResourceType.class })
 public class JavaEditorPresenter
         extends TextEditorPresenter {
 
@@ -54,39 +53,43 @@ public class JavaEditorPresenter
     @Inject
     private MultiPageEditor multiPage;
 
+    @Inject
+    private JavaResourceType type;
+
     @OnStartup
-    public void init(final Path path) {
-        this.path = checkNotNull("path", path);
+    public void init( final Path path ) {
+        this.path = checkNotNull( "path", path );
 
-        super.onStartup(path);
+        super.onStartup( path );
 
         this.path = path;
 
         IsWidget widget = super.getWidget();
         multiPage.addWidget(
                 widget,
-                CommonConstants.INSTANCE.EditTabTitle());
+                CommonConstants.INSTANCE.EditTabTitle() );
 
-        multiPage.addPage(new Page(metadataWidget,
-                CommonConstants.INSTANCE.MetadataTabTitle()) {
+        multiPage.addPage( new Page( metadataWidget,
+                                     CommonConstants.INSTANCE.MetadataTabTitle() ) {
             @Override
             public void onFocus() {
-                metadataWidget.showBusyIndicator(CommonConstants.INSTANCE.Loading());
-                metadataService.call(new MetadataSuccessCallback(metadataWidget,
-                        isReadOnly),
-                        new HasBusyIndicatorDefaultErrorCallback(metadataWidget)).getMetadata(path);
+                metadataWidget.showBusyIndicator( CommonConstants.INSTANCE.Loading() );
+                metadataService.call( new MetadataSuccessCallback( metadataWidget,
+                                                                   isReadOnly ),
+                                      new HasBusyIndicatorDefaultErrorCallback( metadataWidget ) ).getMetadata( path );
             }
 
             @Override
             public void onLostFocus() {
                 //Nothing to do
             }
-        });
+        } );
     }
 
     @WorkbenchPartTitle
     public String getTitle() {
-        return "Java Editor [" + FileNameUtil.removeExtension(path.getFileName()) + "]";
+        return "Java Editor [" + FileNameUtil.removeExtension( path,
+                                                               type ) + "]";
     }
 
     @WorkbenchPartView